Imported Upstream version 20131009+ds1+gitcbb43ba
Merge tag 'upstream/20131009+ds1+gitcbb43ba'

Upstream version 20131009+ds1+gitcbb43ba