Merge branch 'hotfix/1.0.18' v1.0.18
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Feb 2016 21:46:59 +0000 (16:46 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Feb 2016 21:46:59 +0000 (16:46 -0500)

Trivial merge