Merge branch 'release/v2.1.0' into develop
fix for lua lpeg - seg fault
Update version 2.1.1
Merge branch 'release/v2.1.1'