Merge tag 'v2.1.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:48:24 +0000 (17:48 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:48:24 +0000 (17:48 -0400)
v2.1.12


Trivial merge