Merge from branch 'david/master'