master-bc-745

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