Sync'd branch releases/aurora with upstream @ Fri Oct 31 16:37:35 PDT 2014