allow null formula to pass filter
Merge branch 'master' into gh-pages