1.5

Merged 1.5 to master