rebase to around Sept 23rd 2013 (d5ae1aaa2960d67417d6a6c9b2e0879751510458)