Fixing some synchronization issues
Already synchronized
Merge pull request #592 from bhariharan/master

Fixing some synchronization issues
Merge branch 'master' into unstable
Merge pull request #593 from bhariharan/unstable

Merge branch 'master' into unstable