Merge1.5

Merge in Version 1.5 from upstream. Still require updated api version, so updated.

Specs appear to pass here, may consider submission to upstream.