Merge tag 'v1.1.7' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 20:56:52 +0000 (16:56 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 20:56:52 +0000 (16:56 -0400)
v1.1.7


Trivial merge