Merge branch 'hotfix/1.0.18' v1.0.18
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 20 Dec 2016 19:45:11 +0000 (14:45 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 20 Dec 2016 19:45:11 +0000 (14:45 -0500)

Trivial merge