ginggs and joaquimrocha Update for release 0.6.11