master-bc-687

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