Finished feature/ 41821709/story-with-new-lines

PT-Story-URL: http://www.pivotaltracker.com/story/show/41821709
RB-Review-Request-URL: https://dev.salsitasoft.com/rb/r/4214/
Merge remote-tracking branch 'origin/release/0.3.6' into release/0.3.6