initial upstream branch.
Imported Upstream version 1.5-dev21
Imported Upstream version 1.5-dev21
Imported Upstream version 1.5-dev21
Merge tag 'upstream/1.5-dev21'

Upstream version 1.5-dev21
Merge pull request #1 from anthonysomerset/master

Master