Merge branch 'hotfix/0.15.1'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:55:53 +0000 (14:55 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:55:53 +0000 (14:55 -0400)

Trivial merge