Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 14 06:55:46 PDT 2014