• Merge branch 'master' into locale

    @edunham
    edunham committed Jun 1, 2018
    Loading status checks…
    Verified
    This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
    GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
    425fc08