Project Calico version 0.6.3
Project Calico version 0.6.4
Merge remote-tracking branch 'upstream/master'