Merge branch 'hotfix/1.0.14' v1.0.14
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 12 Feb 2016 14:42:45 +0000 (09:42 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 12 Feb 2016 14:42:45 +0000 (09:42 -0500)

Trivial merge