Merge branch 'hotfix/1.0.10' v1.0.10
authorLaury GvR <laury@gaslightmedia.com>
Wed, 3 Feb 2016 17:47:00 +0000 (12:47 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 3 Feb 2016 17:47:00 +0000 (12:47 -0500)

Trivial merge