Manually merged a couple of my old unpulled commits in to master