Integrated changes from react-nexus-starterkit.