Imported Upstream version 1.0.0.20131204
Merge tag 'upstream/1.0.0.20131204'

Upstream version 1.0.0.20131204
bump version