Merge branch 'master' into bezier_signature