Merged with master

autoload/vimtex/complete.vim

@@ -322,7 +322,7 @@ endfunction
 " {{{1 Filenames (\includegraphics)
 
 let s:img = {
-      \ 'pattern' : '\v\\includegraphics%(\s*\[[^]]*\])?\s*\{[^}]*',
+      \ 'pattern' : '\v\\includegraphics\*?%(\s*\[[^]]*\]){0,2}\s*\{[^}]*',
       \ 'enabled' : 1,
       \}
 

doc/vimtex.txt

@@ -1395,7 +1395,7 @@ documents with |neocomplete| and |vimtex|s omni completion function: >
         \ '\v\\%('
         \ . '\a*cite\a*%(\s*\[[^]]*\]){0,2}\s*\{[^}]*'
         \ . '|\a*ref%(\s*\{[^}]*|range\s*\{[^,}]*%(\{\})?)'
-        \ . '|includegraphics%(\s*\[[^]]*\])?\s*\{[^}]*'
+        \ . '|includegraphics\*?%(\s*\[[^]]*\]){0,2}\s*\{[^}]*'
         \ . '|%(include%(only)?|input)\s*\{[^}]*'
         \ . ')'
 <
@@ -1422,7 +1422,7 @@ To enable automatic completion with |youcompleteme|, use the following options:
   let g:ycm_semantic_triggers.tex = [
         \ 're!\\[A-Za-z]*cite[A-Za-z]*(\[[^]]*\]){0,2}{[^}]*',
         \ 're!\\[A-Za-z]*ref({[^}]*|range{([^,{}]*({})?))',
-        \ 're!\\includegraphics([^]]*])?{[^}]*',
+        \ 're!\\includegraphics\*?(\[[^]]*\]){0,2}\{[^}]*',
         \ 're!\\(include(only)?|input){[^}]*'
         \ ]
 <