R20131024
d455acf2 · Merge branch '7.x-1.x' into KANWEBS-646 ·