Merge tag 'v1.1.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 13 Apr 2015 13:23:19 +0000 (09:23 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 13 Apr 2015 13:23:19 +0000 (09:23 -0400)
v1.1.2


Trivial merge