master-bc-707

http://issues.liferay.com/browse/LIFERAYQA-5291