New fix for the 'weer' command.
Merge remote-tracking branch 'upstream/master'