Merge branch '3.0/pm-3' into 3.0/snapshot-mackerel-3.3-rc2