Sync'd branch releases/aurora with upstream @ Sun Oct 12 15:38:42 PDT 2014