Update to version from master

Include the changes made on the master branch.