Imported Upstream version 20141022
Imported Upstream version 20130922+ds1
Imported Upstream version 20141022+ds1