ticket:13 tests fail
ticket:13 tests fail
ticket:13 tests pass
Merge branch 't13_contact'