Xavier merge master 20140210