Merge branch '2328-keep-permission-hints'
authorTim Pierce <twp@curoverse.com>
Mon, 5 May 2014 18:03:10 +0000 (14:03 -0400)
committerTim Pierce <twp@curoverse.com>
Mon, 5 May 2014 18:03:10 +0000 (14:03 -0400)

Trivial merge