Some fixing for Dec. 2013 release.





@giffels

Hi, Manuel:
Please review this pull request for Dec. 2013 release.
Thanks,
yuyi