Pull from svn bleeding_edge@3716
123 files changed