update trunk from 2.1.4

git-svn-id: https://plugins.svn.wordpress.org/option-tree/trunk@768986 b8457f37-d9ea-0310-8a92-e5e31aec5664