Sync'd branch releases/aurora with upstream @ Mon Sep 22 14:28:37 PDT 2014