completed merge from master
40 files changed