Merged v1.1 to master