Closed meh-uk closed 9 years ago
Merging fixes from @OlegKi's branch up to but not including 4388f7e3e7acac09dc9f06dd8bc7cfb6b1efe2a4. These changes are untested, but there were less conflicts than with yesterday's.
Merged with minimal testing (i.e. made sure that the demos didn't break :-))
Merging fixes from @OlegKi's branch up to but not including 4388f7e3e7acac09dc9f06dd8bc7cfb6b1efe2a4. These changes are untested, but there were less conflicts than with yesterday's.