Merge remote-tracking branch 'apf/master'

Conflicts:
	ide/puppet/default.pp