Merge tag 'v1.1.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 18:34:36 +0000 (13:34 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 18:34:36 +0000 (13:34 -0500)
v1.1.2


Trivial merge