Merge branch 'hotfix/1.0.14'
authorLaury GvR <laury@gaslightmedia.com>
Mon, 9 Mar 2015 14:57:53 +0000 (10:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 9 Mar 2015 14:57:53 +0000 (10:57 -0400)

Trivial merge