Merge changes from master.

- Fixes issue 128.
Merge remote-tracking branch 'origin/2.5' into 2.5