Confirmed tested with wordpress v4.0
Merge branch 'develop'