am 44508515: Merge "Tidy up long lines"

# By Duane Sand
# Via Duane Sand (1) and Gerrit Code Review (1)
* commit '445085151cff012efefc329b9fa1a311d1d208be':
  Tidy up long lines