Merge "Automatic reformatting by ktlint.py" into tm-qpr-dev