Merged skvorl/beremiz into default

2016-09-09, Paul Beltyukov