Merge stashed changes
Merge master