Pulpv2 - Merging in master and fixing a few minor conflicts.