Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 14 02:22:45 PDT 2014