Sync'd branch releases/aurora with upstream @ Sun Oct  5 07:24:40 PDT 2014