Undo comment. Necessary for snapworld.
Merge remote branch 'upstream/master'