fix fill mode helper
Merge branch 'master' into gh-pages