Merged branch trusty on master.