master-bc-519

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