one more time
Merge remote-tracking branch 'origin/goodbye_liferay' into goodbye_liferay