• Merge branch 'master' into master

    @DiegoRBaquero
    DiegoRBaquero committed May 23, 2017
    Loading status checks…
    ca270f8