Merge "implement deferred scalarobject history load"

diff --cc lib/sqlalchemy/orm/attributes.py
Simple merge

diff --cc lib/sqlalchemy/orm/base.py
Simple merge

diff --cc lib/sqlalchemy/orm/relationships.py
Simple merge

diff --cc lib/sqlalchemy/orm/strategies.py
Simple merge

diff --cc test/orm/test_cascade.py
Simple merge