Merge master from jtalks project.

Merge master from jtalks project.