Merge branch 'hotfix/1.1.14' V1.1.14
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 16:39:22 +0000 (11:39 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 16:39:22 +0000 (11:39 -0500)

Trivial merge