Sync'd branch releases/aurora with upstream @ Sat Nov  1 03:18:27 PDT 2014