merging master onto 1139 changes, resolving conflicts
Merging again to make sure of the changes from github