Merge tag 'v1.2.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 3 Mar 2015 16:57:36 +0000 (11:57 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 3 Mar 2015 16:57:36 +0000 (11:57 -0500)
v1.2.2


Trivial merge