Finished feature/ 35165593/test-story1

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