Merging develop into 2.0.0
Merge develop into 2.0.0
Merge wpstream develop into 2.0.0