Merge branch 'exported_ip'
Merge branch 'master' of github.com:brunoleon/puppet-barman