Fix bootstrap#1270
Merged
DarkDimius merged 17 commits intoscala:masterfrom May 27, 2016
Merged
Commits
Commits on May 23, 2016
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed