Blue octocat is happy again.
Merge branch 'featureB'