Merge pull request #261 from bhariharan/unstable20

Merge 'unstable' into unstable20
Update version code on unstable20, since unstable doesn't exist anymore