# HG changeset patch
# User robcast
# Date 1445941410 -3600
# Node ID 21da78f0a267c4829733a616873d5966d1564a31
# Parent  18690b59687e361887579c009e3e35dc9260d614# Parent  75ec39abcbba2d5d6e3e12fc43c8a829e7dd18d7
Merge from new_scaling branch
75ec39abcbba2d5d6e3e12fc43c8a829e7dd18d7