Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 29 06:49:57 PDT 2014