Merge branch 'hotfix/1.1.16' v1.1.16
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Feb 2017 21:32:50 +0000 (16:32 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Feb 2017 21:32:50 +0000 (16:32 -0500)

Trivial merge