Merge pull request #2 from jrogelstad/21664
authorTravis Webb <travis@traviswebb.com>
Thu, 7 Nov 2013 21:36:56 +0000 (13:36 -0800)
committerTravis Webb <travis@traviswebb.com>
Thu, 7 Nov 2013 21:36:56 +0000 (13:36 -0800)
issue #21664: Some fixes.


Trivial merge