Merge branch 'hotfix/1.0.14' v1.0.14
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 May 2016 14:15:01 +0000 (10:15 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 May 2016 14:15:01 +0000 (10:15 -0400)

Trivial merge