proxy: fixed bad merge
Merge branch '14.06'