master-bc-712

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