Xavier merge master 20140211