WP 3.9.2
composer update
Merge pull request #97 from etcook/master

WordPress 3.9.2
Merge remote-tracking branch 'upstream/master'

Conflicts:
	composer.json