Sync'd branch integration/b2g-inbound with upstream @ Sat Sep 27 14:38:43 PDT 2014