Merge tag 'v1.1.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 20:57:06 +0000 (16:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 20:57:06 +0000 (16:57 -0400)
v1.1.12


Trivial merge