Merge pull request #1 from git-cola/master

Merge upstream changes
Merge pull request #376 from Vdragon/master

Merge upstream changes