master

Hey @brunobasto,

Attached is an update for http://issues.liferay.com/browse/master.

Please let me know if you have any questions.  Thanks!