rebased onto 24135b95df89d3bc3a837bc8743e3782c9254590
rebased onto b1165ef54d1cd0ce09d62b0f479da6b6003d0803
Pull-Request has been merged by bcotton