Fixed merge issue after rebasing cam-py with master