Add missing include
Merge branch '4.6'
The Path API wasn't available for 4.6 yet
Merge branch '4.6'
Port to Path API