Merging in SVN changes since v1.9.1.8 (81674).

Includes changes in original SVN repo up to SVN commit 96133.