Merge branch 'hotfix/1.2.0' v1.2.0
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jun 2015 15:30:58 +0000 (11:30 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jun 2015 15:30:58 +0000 (11:30 -0400)

Trivial merge