Merge branch 'master' into t5_edit_form
Merge branch 't5_edit_form'
Merge branch 'master' into t3_http_storage_middleware
ticket:3 Fixed tests to pass on getbarista
ticket:3 Little template change
Merge branch 't3_http_storage_middleware'