Current trunk.
Fixing a small typo.
Merged.
Added missing files and updating.
Fixing unnecessary link problem.
Merge branch 'master' into trunk
Merge branch 'trunk'