Merge branch 'hotfix/0.3.1' v0.3.1
authorLaury GvR <laury@gaslightmedia.com>
Wed, 21 Dec 2016 20:23:23 +0000 (15:23 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 21 Dec 2016 20:23:23 +0000 (15:23 -0500)

Trivial merge