Merge tag 'v1.2.0' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:59:06 +0000 (09:59 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:59:06 +0000 (09:59 -0400)
v1.2.0


Trivial merge