Pulling in 1.2.5 changes from Github

git-svn-id: https://plugins.svn.wordpress.org/bu-navigation/trunk@1048298 b8457f37-d9ea-0310-8a92-e5e31aec5664