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