Merge branch 'hotfix/1.2.1' v1.2.1
authorLaury GvR <laury@gaslightmedia.com>
Thu, 2 Jul 2015 17:32:43 +0000 (13:32 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 2 Jul 2015 17:32:43 +0000 (13:32 -0400)

Trivial merge