Merge recent Master into release 1.0.5