am 7fac4d6c: am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase /...
am 7fac4d6c: am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev
* commit '7fac4d6c':
Fix: line slop shouldn't always increase / decrease by one line