Sync'd branch releases/aurora with upstream @ Fri Oct 24 13:40:40 PDT 2014