Merge tag 'v1.1.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:55:46 +0000 (15:55 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:55:46 +0000 (15:55 -0500)
v1.1.5


Trivial merge