Broke up giant function
Merge remote-tracking branch 'origin/master' into fisheye
Merge master into branch.