Reverted master to branch, bug fixes only.

Reverted master to branch, bug fixes only.