Merge tag 'v1.2.1' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:52:09 +0000 (12:52 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:52:09 +0000 (12:52 -0400)
v1.2.1


Trivial merge