Sync'd branch releases/aurora with upstream @ Sun Oct 19 20:58:38 PDT 2014