Merge "Traffic is routed to the master if no slaves available". Fix bug-129
branch 'develop' updated from 'master'