master-bc-409

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