Milestone 3.x progress

Finishes

1. #115 (closed)
2. #127 (closed)
3. #131 (closed)
4. #132 (closed)
5. #136 (closed)
6. #138 (closed)