Merge tag 'v1.1.6' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 14:58:14 +0000 (10:58 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 14:58:14 +0000 (10:58 -0400)
v1.1.6


Trivial merge