Merge branch 'master' into b2
Merge branch 'master' of https://github.com/ryanjk/ryanjk.github.com