'Make project' setting reverted to CheckBox
Merge remote-tracking branch 'origin/master'