Merging master pre-runcible-1.0.0 into puppet