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

    @farodin91
    farodin91 committed Aug 9, 2015
    Loading status checks…
    96ae3d4