rebased onto 7ec6513226379caff2b17ec9130b22d2902b472f
rebased onto b72bfa8ea7606fc39d4ed437e5bc791bb2bc2368
Pull-Request has been merged by bcotton