Merge remote branch 'public/master' into periodic-merge-20130812
Merge pull request #486 from axsh/periodic-merge-20130812

Periodic merge 20130812
Merge branch 'master'