Preparing for version 2.6.0.4