Merge branch 'hotfix/1.0.16' v1.0.16
authorLaury GvR <laury@gaslightmedia.com>
Mon, 9 Mar 2015 21:08:05 +0000 (17:08 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 9 Mar 2015 21:08:05 +0000 (17:08 -0400)

Trivial merge