master-bc-691

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