Merge branch 'MasterBugFixing' into 'master'
Tag bos-studio-6.3.0-201405061644 from ci
Revert trunk snapshot version
Merge branch 'master' into 'MasterBugFixing'