Remove some convenience, caused too much trouble.
Merge remote-tracking branch 'origin/master'