Merge branch '2328-keep-permission-flags' (closes #2328)
authorTim Pierce <twp@curoverse.com>
Wed, 14 May 2014 16:24:46 +0000 (12:24 -0400)
committerTim Pierce <twp@curoverse.com>
Wed, 14 May 2014 16:24:46 +0000 (12:24 -0400)

Trivial merge