Sync'd branch releases/aurora with upstream @ Fri Oct 24 08:07:57 PDT 2014