Workaround for log_user issue in test suite: User.current is not set by minitest... (wip)
Merge branch 'master' into travis