Sync'd branch releases/aurora with upstream @ Fri Oct 17 17:28:38 PDT 2014