Imported Upstream version 20131009+ds1+gitcbb43ba