Merge branch 'master' into t1_contact
ticket:3 test for ticket #3 which checks how middleware works
Merge branch 't1_contact'