Merge branch 'master' into rabbitmq-server-1246-master

Author: michaelklishin

.gitignore

@@ -28,5 +28,8 @@ docs/*.html
 # Tracing tools
 *-ttb
 *.ti
+*.lz4*
+callgrind.out*
+callgraph.dot*
 
 PACKAGES/*