Pushing updates for devbranch up to March 7 2014.