Sync'd branch releases/aurora with upstream @ Sun Oct  5 19:03:35 PDT 2014