wordpress-3.3.1 reference
Merge branch 'wordpress'