Merge commit 'd5f0482'
Merge remote-tracking branch 'origin/master' into vagrant-ubuntu-lts-precise64