Patch 17
Merge branch 'develop' of github.com:tchap/testrepo into feature/50887415/test-full-story-diff
Patch 18
Finished feature/ 50887415/test-full-story-diff

PT-Story-URL: http://www.pivotaltracker.com/story/show/50887415
RB-Review-Request-URL: https://dev.salsitasoft.com/rb/r/4115/