Merge "Fix for Giraph UI"