updates
index on master: e30d145 updates
On master: SmartGit/Hg: automatic stash on Rebase.
Updates