master-bc-319

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