Merge pull request #246 from bhariharan/master

Merge 'unstable' into master for 1.5
Add upgrade notes from 1.4.7 to 1.5