Update dev with master

Going through a bump locally with a branch. Would be helpful to make sure dev is up-to-date with `0.5.5` stuff.