Merge tag 'v1.1.8' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 20 Apr 2016 20:31:09 +0000 (16:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 20 Apr 2016 20:31:09 +0000 (16:31 -0400)
v1.1.8


Trivial merge