master-bc-770

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