Fixed commit line height issue
Merged master