0.4.1 goes patch

Back port of PR #1021