Merge branch 'hotfix/1.2.0' v1.2.0
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:58:59 +0000 (09:58 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:58:59 +0000 (09:58 -0400)

Trivial merge