Merge branch 'hotfix/1.1.6' V1.1.6
authorLaury GvR <laury@gaslightmedia.com>
Thu, 3 Mar 2016 22:29:08 +0000 (17:29 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 3 Mar 2016 22:29:08 +0000 (17:29 -0500)

Trivial merge