Jenlampton 135 meta3 jen2

PR for backdrop/backdrop-issues#135

Replaces PR https://github.com/backdrop/backdrop/pull/120.