Xavier merge master 20140220