Imported Upstream version 1.0.0.20131118
Merge tag 'upstream/1.0.0.20131118'

Upstream version 1.0.0.20131118
Upstream version bump