checkstyle newline
Merge remote-tracking branch 'wade1012/dev' into dev