• Merge remote-tracking branch 'upstream/master'

    @farodin91
    farodin91 committed Jul 21, 2015
    d7a6985