Merge tag 'v1.1.8' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 19:01:04 +0000 (15:01 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 19:01:04 +0000 (15:01 -0400)
v1.1.8


Trivial merge