Merge pull request #258 from annando/1504-fbsync-deprecated