Perf fixes june 2014 2 #1359