Pulling down changes

Pulling more changes from master into Ian.