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