Updates

Latest updates from ‘hg pull && hg update’ on 3rd August 2014.