Merge branch 'release/1.0.52' v1.0.52
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 29 Dec 2015 21:39:14 +0000 (16:39 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 29 Dec 2015 21:39:14 +0000 (16:39 -0500)

Trivial merge