Xavier merge master 20140214 2