Sync'd branch releases/aurora with upstream @ Mon Sep 29 18:41:38 PDT 2014