mandatory/urgent: earlier mandatory update.
Merge branch 'master' into release-0.1.3