merge from 4.5 to master

[Rajani Karuturi]

last attempt was a failure with travis failures before and after the pull
requests and hence abandoned the merge. Now that travis is green, I
planning to put up another pull request.

let me know if you see any issues.

~Rajani