Merge master branch into release 1.0.1 branch