Merge commit '623fce3' into uritemplate 3.0.0. Initial commitcd  of uritemplate 3.0.0.
am: 43c5a5f39f

Change-Id: I6e634f25868ce6ba93cfa91b32e6d33b7222d0ee