Merge branch 'hotfix/1.1.14' v1.1.14
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Apr 2015 16:09:41 +0000 (12:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Apr 2015 16:09:41 +0000 (12:09 -0400)

Trivial merge