Make it possible to pass block to base controller functions
Merge branch 'master' into blocks