Merge branches 'strutz', 'ackrc', 'expose-specifier' and 'more-fore' into bleeding-edge