Merge branch 'Guardsquare:master' into master

Author: zlataovce

retrace/src/proguard/retrace/ReTrace.java

@@ -226,6 +226,9 @@ private String handle(FrameInfo obfuscatedFrame, FrameRemapper mapper, FramePatt
                     }
 
                     result.append(trimmedLine);
+                    if (retracedFrames.hasNext()) {
+                        result.append(System.lineSeparator());
+                    }
                 }
 
                 previousLine = retracedLine;