master-bc-418

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