Copy the notice about dict-style access to options to the backwards-compat section.
Merge branch 'branch3.0'