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