# HG changeset patch
# User robcast
# Date 1447270390 -3600
# Node ID 7f6b5e7e2afdbcc5a83ee3c29179ce52f6023242
# Parent  c4d32640c1bebd2fb8b965ee97e745f9601f255e# Parent  a2da0b5caedd6005d2be15c0507e4cb17d464d8e
Merge from new_scaling branch
 a2da0b5caedd6005d2be15c0507e4cb17d464d8e