commented out DOMAIN_CURRENT_SITE
Upgraded WP to 3.6
Upgraded WP to 3.6
Merge 3.6 into develop
Merged 3.6 into develop