master-bc-316

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