Imported Upstream version 0.1.18.2013105
Merge tag 'upstream/0.1.18.2013105'

Upstream version 0.1.18.2013105
Bump to match setup.py version