Merge branch 'hotfix/1.1.19' v1.1.19
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Apr 2015 13:43:37 +0000 (09:43 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Apr 2015 13:43:37 +0000 (09:43 -0400)

Trivial merge