Merge branch 'hotfix/1.1.3' v1.1.3
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 21:55:30 +0000 (16:55 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 21:55:30 +0000 (16:55 -0500)

Trivial merge