squash! Merged master