master-bc-415

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