Pushed to upstream

cc/ @rotty3000 Please see failures here: http://ci.liferay.org.es/jenkins/job/liferay-portal-master/2234/testReport/