Merge branch '623_context_hooks'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 15 May 2013 16:40:51 +0000 (11:40 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 15 May 2013 16:40:51 +0000 (11:40 -0500)

Trivial merge