master-bc-747

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