master-bc-324

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