#690: versions up
Merge branch 'master' into 690
#690: changes explained
#690: doc fix
#690: version back to SNAPSHOT
#690: doc