Pushed as db340ca57a7991b0b2c8c4c5f5c28e218b2ad700 to master with minor
commit message adjustments.