Merging changes on master to 1.8.6-p383
Use git reset instead of checkout for resetting