Checkin changes
Merged from gh-pages branch
remerged