Fixing eclipse issues
Merge branch 'trunk' into eclipse
Merge branch 'trunk' into eclipse
Merge remote-tracking branch 'upstream/trunk' into eclipse
Merge remote-tracking branch 'upstream/trunk' into eclipse
Merge remote-tracking branch 'upstream/trunk' into eclipse
Merge branch 'eclipse' into trunk