Merge tag 'v1.1.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 15 Jun 2015 20:47:41 +0000 (16:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 15 Jun 2015 20:47:41 +0000 (16:47 -0400)
v1.1.12


Trivial merge