• Merge remote-tracking branch 'upstream/master'

    @farodin91
    farodin91 committed Jul 23, 2015
    7c09238