Merge branch 'hotfix/1.1.13' v1.1.13
authorLaury GvR <laury@gaslightmedia.com>
Fri, 19 Aug 2016 13:27:24 +0000 (09:27 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 19 Aug 2016 13:27:24 +0000 (09:27 -0400)

Trivial merge