Merge remote-tracking branch 'refs/remotes/origin/master' into pr/61

Author: tianon

apache/Dockerfile

@@ -10,9 +10,9 @@ RUN docker-php-ext-install mysqli
 
 VOLUME /var/www/html
 
-ENV WORDPRESS_VERSION 4.1.0
-ENV WORDPRESS_UPSTREAM_VERSION 4.1
-ENV WORDPRESS_SHA1 f0437c96ae3d8acaba3579566f1346f4cd06468e
+ENV WORDPRESS_VERSION 4.1.1
+ENV WORDPRESS_UPSTREAM_VERSION 4.1.1
+ENV WORDPRESS_SHA1 15d38fe6c73121a20e63ccd8070153b89b2de6a9
 
 # upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
 RUN curl -o wordpress.tar.gz -SL https://wordpress.org/wordpress-${WORDPRESS_UPSTREAM_VERSION}.tar.gz \