Sync'd branch releases/aurora with upstream @ Wed Oct  1 23:36:36 PDT 2014