Xavier merge master 20140224