Merge branch 'master' into develop
authorPaul Brossier <piem@piem.org>
Mon, 9 Dec 2013 18:42:46 +0000 (13:42 -0500)
committerPaul Brossier <piem@piem.org>
Mon, 9 Dec 2013 18:42:46 +0000 (13:42 -0500)

Trivial merge