Merge tag 'v1.1.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 3 Mar 2016 20:46:42 +0000 (15:46 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 3 Mar 2016 20:46:42 +0000 (15:46 -0500)
v1.1.2


Trivial merge