Merge branch 'master' into stable

* master:
  Revert "Merge pull request #112 from stelford/master"
(packaging) Update VERSION to 1.3.0-rc2
Merge tag '1.3.0-rc2'

1.3.0-rc2

* tag '1.3.0-rc2':
  (packaging) Update VERSION to 1.3.0-rc2