Merge branch 'hotfix/1.1.17' v1.1.17
authorLaury GvR <laury@gaslightmedia.com>
Mon, 6 Mar 2017 14:08:48 +0000 (09:08 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 6 Mar 2017 14:08:48 +0000 (09:08 -0500)

Trivial merge