note about localhost.localdomain
ignore my meta
Merge branch 'master' into merge-hiveminder-rcs