Merge branch 'release/1.0.57' v1.0.57
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Jan 2016 20:32:27 +0000 (15:32 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Jan 2016 20:32:27 +0000 (15:32 -0500)

Trivial merge