Merge branch 'rkh-find-admin', fixes travis-ci/travis-ci#1045