removed all references to 'Bliss'
Merge branch 'master' into devel