Merge from current master

The imaginary pull (D-Programming-Language/phobos/pull/1797) needs to be made up to date with the existing master