merged in latest dev changes (after 1.0.RC2.1 release)