master-bc-685

http://issues.liferay.com/browse/LIFERAYQA-5259

I got rid of the merge conflict from last time.