Sync'd branch releases/aurora with upstream @ Sun Oct 12 21:43:41 PDT 2014