Xavier merge master 20140204

Getting xavier up-to-date with master