rebased onto 0cf972ed44eaf7a90d0dffd1af1a92ad29653fc9
rebased onto 2e0b2d3b77efa9d4647ede5cbfa7fd6fc9dd9cc9
Pull-Request has been merged by billauger