Update with upstream b6d0b4175f

Merge remote-tracking branch 'upstream/master' into merge-upstream-08112013

Conflicts:
	Puppetfile
	Puppetfile.lock