Merge tag 'v1.2.0' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jun 2015 15:31:04 +0000 (11:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jun 2015 15:31:04 +0000 (11:31 -0400)
v1.2.0


Trivial merge