Xavier mm 2014 01 28

This is an xavier merge with current master.