Release 2.0.0 - with bump to ff 1.2.1
Merge branch 'master' into develop