Propogating bug fixes to development branch