Issue #2368067 by juliangb: Update for PM 2.x.