Sync'd branch releases/aurora with upstream @ Fri Oct 10 21:01:46 PDT 2014