Merge bramstein/closure-compiler-inline
Merge branch 'merge-inline-annotation'