server is sometimes cranky about attr:value spacing
Merge branch 'hotfix/0.1.6'