Merge tag 'v1.1.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 2 Nov 2016 13:06:38 +0000 (09:06 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 2 Nov 2016 13:06:38 +0000 (09:06 -0400)
v1.1.12


Trivial merge