Fixing header paths in pod spec
Merge pull request #855 from khawkins/podspec_fix

Fixing header paths in pod spec
Merge remote-tracking branch 'upstream/master' into unstable_merge
Merge pull request #856 from khawkins/unstable_merge

Merging master back to unstable