Merge the latest change and addons.

3/20/2014 - 4.3.4