merged latest fixes from R_0_8_6 branch

This commit is contained in:
Markus Fröschle
2014-12-29 14:44:55 +00:00
parent 550572d2d3
commit c90a6e58f9

File diff suppressed because it is too large Load Diff