cleaned up after accidental merge from blog branch
Merge branch 'master' into myblog