Sync'd branch releases/aurora with upstream @ Sun Oct 26 15:49:41 PDT 2014