syncing up with master#7

eleventigers wants to merge 12 commits intoexptailwinded/peekable_serv:expfrom

mastertailwinded/peekable_serv:masterCopy head branch name to clipboard