Merge branch 'hotfix/1.0.14' V1.0.14
authorLaury GvR <laury@gaslightmedia.com>
Wed, 20 Aug 2014 18:44:26 +0000 (14:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 20 Aug 2014 18:44:26 +0000 (14:44 -0400)

Trivial merge