1.8.2 dev merge

This brings the 1.8.2 branch on master state