Sync'd branch releases/aurora with upstream @ Fri Oct 10 18:31:36 PDT 2014