Merge from sibling 'master' into 'eway'.
Merge branch 'eway' of github.com:silence/home into eway