master-bc-1507

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