• Merge branch 'master' into clippy-fixes

    @daniellockyer
    daniellockyer committed May 18, 2017
    Loading status checks…
    78b4f57