master-bc-722

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