Imported Upstream version 0.9.2014.10.13
Imported Upstream version 0.9.2014.10.13
Merge tag 'upstream/0.9.2014.10.13'

Upstream version 0.9.2014.10.13