Imported Upstream version 2.1.8.20130723