New git mergeable alias.
Shortcut for gettext in PHP templates.
Update submodules.
Merge branch 'master' into leo-work