Tue, 30 Dec 2014 21:00:03 +0300 Merge fixes from .21 branch
unc0rr [Tue, 30 Dec 2014 21:00:03 +0300] rev 10728
Merge fixes from .21 branch
(0) -10000 -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 tip