Changes to 'stable-0.15'