start base on release
Finished feature/ 52218049/test-bug-1

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