Merge branch '3151-permission-ttl'
authorTim Pierce <twp@curoverse.com>
Wed, 2 Jul 2014 18:07:06 +0000 (14:07 -0400)
committerTim Pierce <twp@curoverse.com>
Wed, 2 Jul 2014 18:07:28 +0000 (14:07 -0400)
Closes #3151.


Trivial merge