Back-merge LICENSE and README changes from master