merge to dev-2.0.0 20130129