Merge tag 'V1.1.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 3 Mar 2016 22:24:58 +0000 (17:24 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 3 Mar 2016 22:24:58 +0000 (17:24 -0500)
v1.1.5


Trivial merge