Merge pibrella's master into e2jk's master