Merge branch 'hotfix/1.1.3' v1.1.3
authorLaury GvR <laury@gaslightmedia.com>
Mon, 13 Apr 2015 15:43:43 +0000 (11:43 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 13 Apr 2015 15:43:43 +0000 (11:43 -0400)

Trivial merge