Merge branch 'hotfix/1.0.14' v1.0.14
authorLaury GvR <laury@gaslightmedia.com>
Wed, 20 Jan 2016 16:08:02 +0000 (11:08 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 20 Jan 2016 16:08:02 +0000 (11:08 -0500)

Trivial merge