Merge branch '2800-pgs' refs #2800
authorTom Clegg <tom@curoverse.com>
Mon, 18 Aug 2014 18:26:59 +0000 (14:26 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 18 Aug 2014 18:26:59 +0000 (14:26 -0400)

Trivial merge