master-bc-746

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