Merge pull request #789 from drozer/master

typo in quotes
new talk and sfp till 1 may