Pull in 1.2.8 from upstream.

Signed-off-by: David Black <dblack@atlassian.com>