Commit before refactoring server with tests.
Transition commit for maffi.
Merge remote-tracking branch 'origin/master'