Xavier merge master 20140207

Keeping xavier up to date with master