Merge tag 'V1.1.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 18 Nov 2015 14:10:23 +0000 (09:10 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 18 Nov 2015 14:10:23 +0000 (09:10 -0500)
v1.1.2


Trivial merge