Merge branch 'hotfix/1.2.2'
authorLaury GvR <laury@gaslightmedia.com>
Tue, 3 Mar 2015 16:57:26 +0000 (11:57 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 3 Mar 2015 16:57:26 +0000 (11:57 -0500)

Trivial merge