Merge branch 'hotfix/Added_missing_is_py3_variable' into develop
Merge branch 'master' into develop
Merge branch 'hotfix/0.90.1.2' into develop
Merge pull request #411 from aparo/develop

Merged from Develop. Fixed query serialization bug in scripting.
Merge pull request #412 from aparo/develop

Added retry_time and improved mapping management.
Merge remote-tracking branch 'upstream/develop' into develop
Fixed missing missing field in script fields and added test for the functionality.
Merge remote-tracking branch 'upstream/master' into develop