Merge tag 'v1.1.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 19:04:22 +0000 (14:04 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 19:04:22 +0000 (14:04 -0500)
v1.1.2


Trivial merge