* merge master changes into twitterfields