Merge branch 'hotfix/1.0.10' v1.0.10
authorLaury GvR <laury@gaslightmedia.com>
Tue, 19 Jan 2016 14:09:10 +0000 (09:09 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 19 Jan 2016 14:09:10 +0000 (09:09 -0500)

Trivial merge