Merge branch 'master' into cahn-hilliard