Sync'd branch releases/aurora with upstream @ Fri Oct 10 06:12:35 PDT 2014