• Merge remote-tracking branch 'upstream/master'

    @farodin91
    farodin91 committed May 28, 2015
    954cf2b