Bug 1095616 - upstream bump to 0.11.1