Merge branch 'master' into core-updates

This commit is contained in:
Ludovic Courtès 2015-12-12 11:42:12 +01:00
commit e82e55e58c
311 changed files with 48442 additions and 5073 deletions

File diff suppressed because it is too large Load diff