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