Merge branch 'hotfix/1.0.14' v1.0.14
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 22:08:19 +0000 (17:08 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 22:08:19 +0000 (17:08 -0500)

Trivial merge