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

    @farodin91
    farodin91 committed Aug 14, 2015
    c4213b4