The last couple months worth of fixes.
Merge commit 'b13003d'