Merge pull request #918 in master
Merge pull request #918 in master
remove surplus semicolon at tutorial.dbadapter.rst
Merge pull request #969
Merge pull request #969 in develop