Merge branch 'master' into hike
hike: Add verbose name
Merge branch 'hike'
Merge branch 'master' into blog