Merge branch 'hotfix/1.1.7' V1.1.7
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 14:10:01 +0000 (09:10 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 14:10:01 +0000 (09:10 -0500)

Trivial merge