Update master with omniti-labs:template