Imported Upstream version 0.0.0~20131217
Merge tag 'upstream/0.0.0_20131217'

Upstream version 0.0.0~20131217