Version 1.2

Updated to version 1.2 from the github tag.

Change-Id: I4096fba7573f5c8626a7d38252bff3529d5b00b9