Merge branch 'significant-figures'