Merge tag 'v1.1.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 16:49:31 +0000 (11:49 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 16:49:31 +0000 (11:49 -0500)
v1.1.2


Trivial merge