merge master into core