Merge tag 'v1.1.6' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 14:58:14 +0000 (10:58 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 14:58:14 +0000 (10:58 -0400)
commit22e02fc93567ff4e9869d56f5635cd706bc8e3ca
treeb6786adf68d368044c061c34653e950f38dd21d8
parentc87ba958a984d6cb6c7c2f4a6184f7a081006133
parent4ea8f845257c679ed4233dbe0a29ed15dbc0630b
Merge tag 'v1.1.6' into develop

v1.1.6