Merge remote-tracking branch 'remotes/origin/master' into issue04 (updates after merge)