Merge branches 'master' and '0.1.X' into 0.1.X
Merge branches '0.1.X' and 'master'