Syncing our fork to upstream master

http://www.hpique.com/2013/09/updating-a-fork-directly-from-github/