Merged David's nightly and Andrew's cam-py branches into David's cam-py branch