master-bc-313

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