• Merge branch 'master' into master

    @Krizz
    Krizz committed Oct 19, 2015
    Loading status checks…
    2e42a8a