Imported Upstream version 1.1.0pre~git20130315~155248+b85e8a5
Merge remote-tracking branch 'origin/master'