Merge branch 'master' into MergeWP1.8.5

Conflicts:
nbproject/private/private.properties