rails 4 path class does not support += anymore
merge branch 'master' into adaptors