Whoops, wrong variable name used....
Merge branch 'master' into toast-ajax-integration