Merge tag 'v1.2.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 2 Jul 2015 17:43:03 +0000 (13:43 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 2 Jul 2015 17:43:03 +0000 (13:43 -0400)
v1.2.2


Trivial merge