Confirmed compatible with wordpress 3.9.1
Merge branch 'develop'