Update resources revision
Merge branch 'master' into production