Merge remote-tracking branch 'jfirebaugh/562'
authorTom Hughes <tom@compton.nu>
Tue, 3 Dec 2013 00:23:16 +0000 (00:23 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 3 Dec 2013 00:23:16 +0000 (00:23 +0000)

Trivial merge