TISTUD-5561
Merge branch 'development' of https://github.com/aptana/studio3 into development