Merge branch 'master' into remove-old-options