Master -> 2.0

Migrated some changes from master into v2.0-master (as they should have been merged into that branch in the first place