[2.0] Backport all changes from trunk

We only backport change that do not affect API or ABI
Update issue 313
This commit is contained in:
Mathieu Malaterre
2014-03-25 15:16:07 +00:00
127 changed files with 21162 additions and 19576 deletions

File diff suppressed because it is too large Load Diff