Merge tag 'V1.1.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 16:03:51 +0000 (11:03 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 16:03:51 +0000 (11:03 -0500)
v1.1.18


Trivial merge