Shameless self-plug :-)
Merge branch 'master' into personal_config