Merge master with 1.0a