Merge remote-tracking branch 'origin/4.3.4' into 6.x

This commit is contained in:
DDuarte
2014-10-19 00:23:18 +01:00
41 changed files with 1644 additions and 419 deletions

File diff suppressed because one or more lines are too long