Manually merge with ghbook#master