Reviewed changes from #ab2c58a

All changes were already included. Made a minor edit.