smush.it personal pic
Merge branch 'master' into gh-pages