Merge branch 'hotfix/1.1.14' v1.1.14
authorLaury GvR <laury@gaslightmedia.com>
Fri, 19 Jun 2015 15:49:00 +0000 (11:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 19 Jun 2015 15:49:00 +0000 (11:49 -0400)

Trivial merge