quick fix for NPE
Merge branch 'origin/master'