Merge branch 'hotfix/1.0.15' v1.0.15
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 1 Mar 2017 17:11:01 +0000 (12:11 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 1 Mar 2017 17:11:01 +0000 (12:11 -0500)

Trivial merge