v1.21 b2

Rough fix for broken plist handling in Mavericks