Checkout
Christophe Jaillet
committed
on 25 May 17
Backport r1772559, r1774492, r1774493, r1774505 + reorder section/module in order to synch with trunk.