Commit before merge Akshay's changes from the week-end.
Commit before merge Akshay's changes from the week-end.

mhuwiler/rootauto,mhuwiler/rootauto,mhuwiler/rootauto,mhuwiler/rootauto,mhuwiler/rootauto,mhuwiler/rootauto,mhuwiler/rootauto,mhuwiler/rootauto,mhuwiler/rootauto,mhuwiler/rootauto,mhuwiler/rootauto