Merge tag 'v1.1.6' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 24 Aug 2016 19:12:17 +0000 (15:12 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 24 Aug 2016 19:12:17 +0000 (15:12 -0400)
v1.1.6


Trivial merge