Merge branch 'master' into jhh-dev
authorroot <root@node46.princeton.vicci.org>
Mon, 22 Sep 2014 20:12:19 +0000 (20:12 +0000)
committerroot <root@node46.princeton.vicci.org>
Mon, 22 Sep 2014 20:12:19 +0000 (20:12 +0000)

Trivial merge