Merge branch 'master' into stable
Merge branch 'stable' of github.com:aptana/source.ruble into stable