Mostly cherry-picks from master:

    commit d48222d2
    Author: laurocaetano
    Date:   Fri Nov 1 18:15:53 2013 -0200

    commit 49062c12
    Author: Rashmi Yadav
    Date:   Fri Nov 1 18:07:27 2013 +0100

    commit c10a7812
    Author: Arun Agrawal
    Date:   Fri Nov 1 10:39:06 2013 +0100

    commit 81612686
    Author: Arun Agrawal
    Date:   Fri Nov 1 09:49:57 2013 +0100

    commit 4d4ff531
    Author: Aaron Patterson
    Date:   Thu Oct 31 11:47:51 2013 -0700