beta-20170112
5651988b · Merge pull request #12838 from tamird/fix-vendor ·