Fix for deadlock seen in https://trello.com/c/4rdEwSXh
Merge branch 'master' into topic-data-incrementalupdate
Added .cxx as a supported C++ extension. Fixes https://trello.com/c/2faPolgP