Merge branch 'hotfix/1.0.14' v1.0.14
authorLaury GvR <laury@gaslightmedia.com>
Tue, 1 Mar 2016 17:51:09 +0000 (12:51 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 1 Mar 2016 17:51:09 +0000 (12:51 -0500)

Trivial merge