135-meta3-jen17

Another PR for https://github.com/backdrop/backdrop-issues/issues/135