Jenlampton 135 meta3 jen6

PR for backdrop/backdrop-issues#135.

This replaces the PR at https://github.com/backdrop/backdrop/pull/149, fixing the tests.