Merge branch 'hotfix/1.1.14' v1.1.14
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 13:08:49 +0000 (09:08 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 13:08:49 +0000 (09:08 -0400)

Trivial merge