Picking from master for 1.0.6