master-bc-771

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