Remove annoying apostrophe from jasmine test
Merge remote-tracking branch: upstream/master