Merge branch 'hotfix/1.0.1' v1.0.1
authorLaury GvR <laury@gaslightmedia.com>
Fri, 19 Feb 2016 21:34:08 +0000 (16:34 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 19 Feb 2016 21:34:08 +0000 (16:34 -0500)

Trivial merge