Use a proper merge reference to get the upstream master.
Merge pull request #436 from kabel/develop

Use a proper merge reference to get the upstream master.