Merged in 3.1.13

commit 271fdcf05f0726fa936fc86a0b1db805ba827073
Author: Ben Osman <dev@smoothify.com>
Date:   Wed Dec 10 02:40:53 2014 +0000

    Bump version

commit fe68188a06c9b740a75932d2c6170dd1c004fc49
Merge: 5841685 6f35fe9
Author: Ben Osman <dev@smoothify.com>
Date:   Wed Dec 10 02:39:44 2014 +0000

    Merge tag 'upstream/3.1.13'

    * tag 'upstream/3.1.13':
      Add upstream version 3.1.13

commit 5841685ea6931f62005653aa092471c71b4b3d86
Author: Ben Osman <dev@smoothify.com>
Date:   Wed Dec 10 02:39:34 2014 +0000

    Remove old version.

commit 6f35fe92de69d598a1988ecbea641e17c74cbfa8
Author: Ben Osman <dev@smoothify.com>
Date:   Wed Dec 10 02:36:22 2014 +0000

    Add upstream version 3.1.13