Merge branch 'hotfix/1.0.15' v1.0.15
authorLaury GvR <laury@gaslightmedia.com>
Mon, 9 Mar 2015 15:00:53 +0000 (11:00 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 9 Mar 2015 15:00:53 +0000 (11:00 -0400)

Trivial merge