Various fix and improvements that can be cherry-picked#22
Merged
Commits
Commits on Apr 11, 2015
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Sep 20, 2015
- committed
Commits on Feb 10, 2016
- authored andcommitted
