• Merge remote-tracking branch 'upstream/master' into window

    @farodin91
    farodin91 committed Jul 31, 2015
    a33ad54