Merge proposals dependent on lp://qastaging/~alexlauni/webapps-applications/webapps-application-wordpress-com

1. webapps-application-wordpress-com
2. Dependent merge proposals