Imported Upstream version 1.0.0.20131125
Merge tag 'upstream/1.0.0.20131125'

Upstream version 1.0.0.20131125
bump to new upstream