Merge upstream
Add angular directive snippet, other little updates