Bug fixes for WP version 3.4
Mergeing bug fixes for WP version 3.4
merge into rewrite