Fix whitespace issues
Removed invalid DCA config options
Added documentation about onversion_ and onrestore_callbacks
Merge branch '2.11' into 2.11-ja.
Catch up to 68043efb848cdf365a6f25e5fb2c91632ec7ef90.
Fix encoding to UTF-8.