Revert "9 Dec 2013"

This reverts commit 37c714766d4cb573ad67dfdb8a05aec8e760795f, reversing
changes made to d77930aed8b093590e3f68cc8a4626f1b17af8b3.
Merge remote-tracking branch 'upstream/master'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
10 12 2013
Merge pull request #43 from kusang/master

10 12 2013 Update