Merged branch 1.1.0 into filter-custom branch

All tests passing.