merge develop into master from github

Just another test.