Merge branch 'hotfix/1.0.14' v1.0.14
authorLaury GvR <laury@gaslightmedia.com>
Tue, 5 Jan 2016 19:02:35 +0000 (14:02 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 5 Jan 2016 19:02:35 +0000 (14:02 -0500)

Trivial merge