Update branch to current master code

Merge master into iOS unit testing branch