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 8cb34bfe15
commit 320230ce31

File diff suppressed because it is too large Load Diff