Merge tag 'V1.1.7' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 14:10:07 +0000 (09:10 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 14:10:07 +0000 (09:10 -0500)
v1.1.7


Trivial merge