Master to Pingli

This is a pull request to merge master to pingli.