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


Trivial merge