Hand-merged Optical-Flow into master

Are we done yet