Seventeenth century Jingdezhen porcelain from the Shanghai Museum and the Butler collections