Started the final touches for 3.3.1