Commit 4/30/2013 behind netbook
Synced with netbook