master-bc-911

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