[placeybordeaux]

Juding by the JIRA tickets most of these changes/fixes landed in 2.0.0 and some landed in 1.6.2.

I have been debating if I should go ahead and start switching to 2.0.0 and this is pushing me in that direction.