Merge branch 'hotfix/1.0.15' V1.0.15
authorLaury GvR <laury@gaslightmedia.com>
Wed, 20 Aug 2014 21:03:04 +0000 (17:03 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 20 Aug 2014 21:03:04 +0000 (17:03 -0400)

Trivial merge