Merge tag 'v1.1.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 16:51:40 +0000 (12:51 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 16:51:40 +0000 (12:51 -0400)
v1.1.5


Trivial merge