Merge pull request #1 from spetzreborn/trunk

Trunk
Merge branch 'trunk'
Merge branch 'trunk'
Merge branch 'trunk'
Merge branch 'trunk'
Merge branch 'trunk'
Merge branch 'trunk'
Merge branch 'trunk'
Merge branch 'trunk'
Merge branch 'master' into trunk