Merge from bitbucket repo 11/24/14.