• Merge remote-tracking branch 'feross/master'

    gpetrov committed Nov 27, 2016