Merge remote-tracking branch 'origin/master' into vagrant-debian-7-wheezy64
fixecho
Merge remote-tracking branch 'origin/vagrant-debian-7-wheezy64'