Merge Kinect fixes into master branch