master-bc-521

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