7.x-3.6 (2013-Dec-17)
missed files
Merge branch 'master' into fix