pull request 08192014

changes see commit history.