Merge remote-tracking branch 'refs/remotes/breton/bug/647'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 5 Mar 2015 22:49:06 +0000 (16:49 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 5 Mar 2015 22:49:06 +0000 (16:49 -0600)

Trivial merge