possible fix for NPE in 1.9.5
compilation issue
1.9.5.1
synchronization with beta branch
formatting
std:: prefix
1.9.5.2
updated ChangeLog