Xavier merge master 2014 03 10