Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 14 04:13:44 PDT 2014